# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1153.67.20 -> 1.1153.67.21
#	include/asm-ia64/acpi.h	1.8     -> 1.9    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/05	bjorn.helgaas@hp.com	1.1153.65.9
# [PATCH] ia64: Add HP AGP 8X bridge and fix ACPI claim
# 
# The following patch to the HP ZX1 GART driver
# - adds recognition of the HWP0007 device (an AGP 8X bridge)
# - fixes the use of acpi_get_devices()
# 
# The problem with acpi_get_devices() is that it always returns AE_OK,
# except when the callback (zx1_gart_probe()) returns a failure.  That
# means agp_hp_init() cannot use the status from acpi_get_devices()
# to distinguish between (1) an AGP bridge was found and successfully
# initialized, and (2) no AGP bridge was found at all.
# --------------------------------------------
# 03/09/05	davidm@tiger.hpl.hp.com	1.1153.65.10
# Merge tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
# into tiger.hpl.hp.com:/data1/bk/lia64/linux-ia64-2.5
# --------------------------------------------
# 03/09/05	davidm@tiger.hpl.hp.com	1.1153.67.21
# ia64: Fix asm-ia64/acpi.h typo & name-collision.
# --------------------------------------------
#
diff -Nru a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h
--- a/include/asm-ia64/acpi.h	Tue Sep  9 01:05:08 2003
+++ b/include/asm-ia64/acpi.h	Tue Sep  9 01:05:08 2003
@@ -55,19 +55,19 @@
 #define ACPI_FLUSH_CPU_CACHE()
 
 static inline int
-acpi_acquire_global_lock (unsigned int *lock)
+ia64_acpi_acquire_global_lock (unsigned int *lock)
 {
 	unsigned int old, new, val;
 	do {
 		old = *lock;
 		new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));
-		val = ia64_cmpxchg4_acq(GLptr, new, old);
+		val = ia64_cmpxchg4_acq(lock, new, old);
 	} while (unlikely (val != old));
 	return (new < 3) ? -1 : 0;
 }
 
 static inline int
-acpi_release_global_lock (unsigned int *lock)
+ia64_acpi_release_global_lock (unsigned int *lock)
 {
 	unsigned int old, new, val;
 	do {
@@ -79,10 +79,10 @@
 }
 
 #define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)				\
-	((Acq) = acpi_acquire_global_lock((unsigned int *) GLptr))
+	((Acq) = ia64_acpi_acquire_global_lock((unsigned int *) GLptr))
 
 #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq)				\
-	((Acq) = acpi_release_global_lock((unsigned int *) GLptr))
+	((Acq) = ia64_acpi_release_global_lock((unsigned int *) GLptr))
 
 const char *acpi_get_sysname (void);
 int acpi_request_vector (u32 int_type);